From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 20:27:26 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=5f7470d118360c67a7a2cf3a0aa29280980a6da3;p=emacs.git

merge from trunk
---

5f7470d118360c67a7a2cf3a0aa29280980a6da3